Skip to content

Conversation

@jprestop
Copy link
Collaborator

Expected Differences

  • Do these changes introduce new tools, command line arguments, or configuration file options? [No]

    If yes, please describe:

Pull Request Testing

  • Describe testing already performed for these changes:

    Reviewed addition in RTD in my feature branch at this location: https://fasteddy-model.readthedocs.io/en/feature_64_publication/publications.html

  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

    Review the addition in RTD in my feature branch at this location and suggest any modifications:
    https://fasteddy-model.readthedocs.io/en/feature_64_publication/publications.html

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]

  • Do these changes include sufficient testing updates? [N/A]

  • Will this PR result in changes to the test suite? [N/A]

    If yes, describe the new output and/or changes to the existing output:

  • Please complete this pull request review by [20250228].

Pull Request Checklist

  • Complete the PR definition above.
  • Ensure the PR title matches the feature or bugfix branch name.
  • Select: Reviewer(s)
  • After submitting the PR, select the ⚙️ icon in the Development section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
  • After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
  • Close the linked issue and delete your feature or bugfix branch from GitHub.

@jprestop jprestop added this to the FastEddy 3.0 milestone Feb 19, 2025
@jprestop jprestop requested a review from domingom February 19, 2025 19:38
@jprestop jprestop linked an issue Feb 19, 2025 that may be closed by this pull request
4 tasks
@domingom
Copy link
Collaborator

This should be a merge with develop branch not main_v2.0

@jprestop
Copy link
Collaborator Author

Well, this is interesting @domingom and @jsauer-NCAR. I ran the following to create my branch off of develop:

/Volumes/d1/jpresto/projects/FastEddy-model/git/FastEddy-model$ git checkout develop
branch 'develop' set up to track 'origin/develop'.
Switched to a new branch 'develop'
/Volumes/d1/jpresto/projects/FastEddy-model/git/FastEddy-model$ git pull
Already up to date.
/Volumes/d1/jpresto/projects/FastEddy-model/git/FastEddy-model$ git checkout -b feature_64_publication
Switched to a new branch 'feature_64_publication'

and only modified the publications.rst file but somehow the "Files Changed" tab above shows that I updated 5 files, which I did not. The other changes appear to be Joe's changes, which were integrated in this PR. I am not sure why they are showing up here. Any idea?

I assume it's ok to proceed with an approval and merge, but I don't fully understand why these changes are showing up so I thought I'd ask about them.

@jprestop jprestop changed the base branch from main_v2.0 to develop February 19, 2025 20:06
@jprestop
Copy link
Collaborator Author

@domingom Thanks for solving the mystery. Please excuse my error. It's all fixed now. Thank you so much!

@domingom domingom merged commit f42667d into develop Feb 19, 2025
3 checks passed
@jprestop jprestop deleted the feature_64_publication branch March 4, 2025 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Documentation: Update Publications page

2 participants